Fix build problems on Cygwin. (#448604)

2007-07-09  Matthias Clasen  <mclasen@redhat.com>

        * modules/printbackends/*/Makefile.am: Fix build problems
        on Cygwin.  (#448604)

svn path=/trunk/; revision=18412

diff --git a/ChangeLog b/ChangeLog
index 6278bb8247c968f745d07621a55fd0d6f9a9de59..5dca5df4059f991c47e036937fe77f1f838380dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * modules/printbackends/*/Makefile.am: Fix build problems
+       on Cygwin.  (#448604)
+
 2007-07-09  Jaap Haitsma  <jaap@haitsma.org>
 
        * gtk/gtkstatusicon.c: Remove usage of deprecated GtkTooltips API. Use

diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
index e768c5bd471598e1bf42b74202ef70128258084e..9b179a1e0b7abcebc0650e5845d4dd34ab2698f5 100644 (file)
--- a/modules/printbackends/cups/Makefile.am
+++ b/modules/printbackends/cups/Makefile.am
@@ -1,4 +1,4 @@
-if OS_WIN32
+if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
@@ -14,8 +14,9 @@ INCLUDES = \
        $(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-       $(GTK_DEP_LIBS)                                 \
-       $(top_builddir)/gtk/$(gtktargetlib)             
+       $(top_builddir)/gtk/$(gtktargetlib)             \
+       $(top_builddir)/gdk/$(gdktargetlib)             \
+       $(GTK_DEP_LIBS)
 
 backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
 

diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am
index b74bdc369f389ea11daccf411a425645d286463e..1afee74ca4e93d59e71deeb626c5efcea269a582 100644 (file)
--- a/modules/printbackends/file/Makefile.am
+++ b/modules/printbackends/file/Makefile.am
@@ -1,4 +1,4 @@
-if OS_WIN32
+if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
@@ -27,6 +27,7 @@ libprintbackend_file_la_LDFLAGS =  \
 
 libprintbackend_file_la_LIBADD = \
        $(top_builddir)/gtk/$(gtktargetlib)             \
+       $(top_builddir)/gdk/$(gdktargetlib)             \
        $(GTK_DEP_LIBS)
 
 noinst_HEADERS =                       \

diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
index 305399c20f45cc13c2b448c58aee341bca2a8e72..a207e01fdb60c25b88d443685df225a4133ef929 100644 (file)
--- a/modules/printbackends/lpr/Makefile.am
+++ b/modules/printbackends/lpr/Makefile.am
@@ -1,4 +1,4 @@
-if OS_WIN32
+if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 

diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am
index cbbfd6034846bdd84e96ef22c72e8b79cc150c9a..e023dc8186bfb75d3fa581fc7b85afcbf182e94a 100644 (file)
--- a/modules/printbackends/test/Makefile.am
+++ b/modules/printbackends/test/Makefile.am
@@ -1,4 +1,4 @@
-if OS_WIN32
+if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif